Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Port Shadowkin #23

Open
wants to merge 66 commits into
base: master
Choose a base branch
from
Open

Port Shadowkin #23

wants to merge 66 commits into from

Conversation

Finket
Copy link
Contributor

@Finket Finket commented Nov 6, 2023 •
edited by DEATHB4DEFEAT
Loading

Description

Port over Shadowkin. #2
Simple-Station/Parkstation#42
This PR creates a lot of directories not yet ported to this rebase.
Many other directories which are required in the original PRs are not yet created / addressed.

TODO

More todo, notes, and comments to address last (tentative):

  • Address removing SleepingComponent.WakeAction (in comments below)
  • What to do with VisibilityFlags? i.e. in Content.Server/...ShadowkinPowerSystem.DarkSwap.cs
  • Fix PlayerAttachedEvent in client systems
  • Remaining Guidebook stuff should be ported separately
  • Add shadow biome space-wizards/space-station-14#21276

I know this is a mess at the moment. Let me cook B-)

Media

@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: UI Changes any XAML files Changes: YML Changes any yml files labels Nov 6, 2023
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 6, 2023 •
edited
Loading

RSI Diff Bot; head commit aa667ea merging into cc03a47
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Parkstation/Clothing/Eyes/Glasses/darkened.rsi

State Old New Status
equipped-EYES Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Parkstation/Clothing/Head/Hardsuits/darkened.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/Parkstation/Clothing/OuterClothing/Hardsuits/darkened.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Parkstation/Clothing/OuterClothing/Misc/shadowkin_restraints.rsi

State Old New Status
body-overlay-2 Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Parkstation/Interface/Actions/shadowkin_icons.rsi

State Old New Status
darkswap Added
rest Added
teleport Added

Resources/Textures/Parkstation/Interface/Alerts/shadowkin_power.rsi

State Old New Status
power0 Added
power1 Added
power2 Added
power3 Added
power4 Added
power5 Added
power6 Added
power7 Added

Resources/Textures/Parkstation/Mobs/Species/Shadowkin/organs.rsi

State Old New Status
appendix Added
brain Added
core Added
ears Added
eyes Added
heart Added
kidneys Added
liver Added
lungs Added
stomach Added
tongue Added

Resources/Textures/Parkstation/Mobs/Species/Shadowkin/parts.rsi

State Old New Status
eyes Added
full Added
head_f Added
head_m Added
l_arm Added
l_foot Added
l_hand Added
l_leg Added
r_arm Added
r_foot Added
r_hand Added
r_leg Added
torso_f Added
torso_m Added

Resources/Textures/Parkstation/Objects/Fun/Plushies/shadowkin.rsi

State Old New Status
shadowkin Added

Edit: diff updated after aa667ea

@DEATHB4DEFEAT
Copy link
Member

:godmode:

@Finket
Copy link
Contributor Author

Finket commented Nov 7, 2023

Some small things had to be refactored for PR209 above. Wrote them and reverted for now since that PR is a draft.

@Finket
Copy link
Contributor Author

Finket commented Nov 8, 2023

Couldn't keep looking at the "Entites" directory, had to fix the typo :D

@DEATHB4DEFEAT
Copy link
Member

Couldn't keep looking at the "Entites" directory, had to fix the typo :D

Amazing

@DEATHB4DEFEAT
reformatting and codebase change markers
8301021 
I didn't want to do a review...
@github-actions github-actions bot removed the Changes: Documentation Changes any xml or md files label Nov 8, 2023
@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Mar 18, 2024
@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jun 3, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jun 3, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@DEATHB4DEFEAT DEATHB4DEFEAT self-assigned this Aug 20, 2024
@github-actions github-actions bot added Changes: Audio Changes any ogg files and removed Status: Merge Conflict FIX YOUR PR AAAGH labels Aug 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Pspritechologist Pspritechologist Awaiting requested review from Pspritechologist Pspritechologist is a code owner

@VMSolidus VMSolidus Awaiting requested review from VMSolidus

@DEATHB4DEFEAT DEATHB4DEFEAT Awaiting requested review from DEATHB4DEFEAT DEATHB4DEFEAT is a code owner

Requested changes must be addressed to merge this pull request.

Assignees

@DEATHB4DEFEAT DEATHB4DEFEAT

Labels
Changes: Audio Changes any ogg files Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: UI Changes any XAML files Changes: YML Changes any yml files Status: Needs Review Someone please review this
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Finket @DEATHB4DEFEAT @VMSolidus @vaketola